Merge branch 'CR_2111_515_Clocktree_yaml_Xingyu.Wu' into 'jh7110-5.15.y-devel'