Merge pull request #454 from john-hill/PLFM-1924

Plfm 1924
Merge pull request #456 from john-hill/PLFM-1924

Plfm 1924
Undo type rename
Merge pull request #459 from xschildw/fix-undo-migtype-rename

Fix undo migtype rename