CFY-1304 added support for workflow completion as well