MAESTRO-2968 logging + env