Merge branch '2_8_1_patch_multiharmony' into Release_2_8_Branch