Issue #2538