Merge branch 'LDC-572' of github.com:makskuharenko/imagex_workflow into LDC-572

Conflicts:
imagex_workflow.module