Merge remote-tracking branch 'remotes/origin/MP1-4444-BUG-Wrong_Channel_mapping_for_3.0_and_4.0_Music_Files'
Merge remote-tracking branch 'remotes/upstream/master' into 1.7.0Fork-BDJ