CLDIDE-2084: update factory in accordance with latest changes of the spec