Issue #2474