PR: 263532 Approved by: Vitaly Magerya <vmagerya@gmail.com> (maintainer) Approved by: gerald (mentor)