Issue #4830