Issue #6340. Partly