Merge pull request #3107 from t-nelson/no_blank_workgroups