Merge branch 'FactoryTest' into vuplus_experimental