Issue #2533