Add test confirming that groups resolve to combine true only when set at the group level.
Merge branch 'dev-master' into dev-3.x