Merge "Remove detachChildren"