Merge pull request #620 from xschildw/PLFM-2129-3

Finish migration for type if failure.
Merge branch 'release-9' into develop