Merge "MidiManager API tweaks:"