Merge "Move auth token checking to begin"