Issue 11715: Merge multiarch fix from 3.1 branch.