Issue #2400 was partially fixed (without tests).