Merge branch 'CR_2862_gt9xx_ts_515_changhuang.liang' into 'vf2-515-devel'