Merge "Move autogrouping into framework."