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