WW-3134 Reduces noise in the logs
WW-4215 Allows constructor injection