Merge "MIDI Manager work in progress"