PR: ports/77845 Submitted by: Sam Lawrance
PR: 38134 Submitted by: Alexey Dokuchaev <danfe@regency.nsu.ru>