Merge branch 'CR_2871_MMC_515_william.qiu' into 'jh7110-5.15.y-devel'