#4344: New patch.