Merge branch 'child-deleted'