Merge "Avoid some duplicate bridge methods" into main