Issue #2545