PR: 139892 Submitted by: myself Approved by: Yuri Pankov (maintainer) Approved by: tabthorpe (co-mentor) Feature safe: yes