Merge "Fix aut_url to honor internal protocol"