fix commit for RAO branch
Fix commit for RAO
Merge remote-tracking branch 'origin/master' into VS-FEATURE-AUTHENTICATION