PR: 154047 Submitted by: Marek Holienka <marekholienka@gmail.com> Approved by: maintainer Feature safe: yes