Issue #7573