Merge pull request #599 from xschildw/PLFM-2068

Plfm 2068
Deletes on exception during ins/upd
Fix
Merge pull request #600 from xschildw/migration-del-on-exception

Migration del on exception
Merge branch 'release-7' into develop