Merge "Use ArrayList as children" into oc-dev