Bring rework-groups-branch up-to-date with current master

Title says it all.