Don't apply the reset to all children.
Merge branch 'hotfix/0.5.2'