Merge "Auth ripple updates" into sc-dev