CFY-1185 merge workflwos code