PR: 217780 Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: bdrewery (mentor, implicit)