Changes for Issue 13547.