Mitigation for Issue #1232

Targeted at the new release branch