Merge "Adding more debugging for group children"