MAESTRO-3034 Initial Checkin