Merge "Fix build on branches != main" into main