#3126
#3126
Merge remote-tracking branch 'origin/master' into issue-3138-Role-API-unit-test