Issue #2522