Severity: wishlist

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