rebased onto a51ef6a02d08551ae966ef6dac016673db69ba1f
If logger is passed, should use it here?
Pull-Request has been merged by jkaluza