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