Issue #10656: Merge AIX build fix from 3.6