Merge "MIDI Manager changes:"