See PR for the list of improvements. PR: 222690 Submitted by: mi Approved by: Marco Beishuizen (the new maintainer)