Merge "Fix build" into main