Issue #2515