Merge "Fix Build Breakage" into main