Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev