PR: 139129 Submitted by: Ganael Laplanche <ganael.laplanche@martymac.com> (maintainer) Feature safe: yes