Issue #2512