MAESTRO-3087 Better logging