Merge pull request #1319 from okorach:migration-get-fp-wf-accepted

Merge pull request #1319 from okorach:migration-get-fp-wf-accepted #1958