Issue #2667