Merge "Add tests for autogrouping" into oc-mr1-dev