Merge commit 'origin/revert_mhl_to_glib_mc-4.6' into mc-4.6