Authored by xuhongyun

Merge branch 'dev_2.2' into test