Severity: wishlist

Please see the attached patch for the proposed change and rationale.