Merge "[P21]Phase in FactoryOta" into sc-dev