Additionally changes for issue 13547.