Merge branch 'hotfix/allow-parent-change' into develop
fix parent changing stuff
Merge branch 'release/0.2.6'