Merge to fix build auth