Issue #2503