Merge "Group suppression shouldn't affect rating limiting" into pi-dev