Merge pull request #458 from xschildw/fix-undo-migtype-rename

Undo type rename
:)
done
Merge pull request #462 from john-hill/PLFM-1926

Plfm 1926