PR: ports/173082, ports/173083 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) Feature safe: yes