Merge "Fix the arc build issue" into main