Proposed fixes for Issue 13547.