PR: ports/154454 Submitted by: maintainer Approved by: wxs@ and pgollucci@ (mentor implicit) Feature safe: yes