Severity: wishlist

Please see the attached patch, intended for master.