Issue #2683