Merges dev-midi-ext branch.