allow change of parent
Merge branch 'hotfix/allow-parent-change'