PR: ports/153464 Submitted by: wen Approved by: wxs@ and pgolluci@ (mentor implicit) Feature safe: yes