Issue #2531