MAESTRO-3050 Initial Checkin