PR: 51674 Submitted by: Ports Fury
PR: 40879 Submitted by: Tilman Linneweh <tilman@arved.de> Additional fixes by yours truly.
PR: ports/24145 Submitted by: Ying-Chieh Liao