Merge "MidiManager updates:"