Issue #4680