Merge commit '7501cdb16d99ee9f1340d0e5e81c21e22084a8f3' into merge_korg_master