Preserve parentId + test
Fix
Merge pull request #1237 from xschildw/PLFM-2727

Preserve parentId + test