Merge branch 'CR_2936_MMC_515_william.qiu' into 'vf2-515-devel'