don't add None the source_group list
merging master