Merge "Fix build error" into main