MAESTRO-2970 formatting, env