Merge fix for Issue #12666 from 3.2