Issue #22359: Merge cross-compilation fix from 3.5