Issue #2517