(c4a5370a82 and ee3a23acd2) PR: ports/167924 Approved by: Mikhail Tsatsenko <m.tsatsenko@gmail.com> (maintainer)