Cherry pick auth changes into milestone master

Merge request reports

Loading