Merge auth changes from HEAD: