Issue #2536