MAESTRO-2969 logging + env