PR: 147656 Submitted by: Gvozdikov Veniamin <g.veniamin@googlemail.com> (maintainer) Feature safe: yes