MAESTRO-3049 Initial Commit