PR: ports/153784, ports/153785 Submitted by: Ivan Klymenko <fidaj@ukr.net> (maintainer) Feature safe: yes