Updated to match role and user it authenticated
Merge remote-tracking branch 'origin' into release