PR: 147776 Submitted by: Robert Kruus <rob.kruus@gmail.com> Approved by: maintainer Feature safe: yes