Merge pull request #379 from vedujoshi/master

Add check for default SG on a custom project
Merge pull request #380 from vedujoshi/master

Complete the merge of commit f885aa9