Merge "Add MIDI Manager API tweaks:"