merge from 3.2 - Correcting issue 12576 fix, which resulted in buildbot failures.