Merge "fallback to v2 on s build" into main