Merge branch 'master' into qa
Add Feature.FriendlyLicenses to csdef
Fixed build break
Simple test fix
Merge branch 'dev' into qa
Merge branch 'qa' into dev