PR: 90165 Submitted by: Lars Balker Rasmussen <lars@balker.dk>
Catalyst. PR: ports/85559 Submitted by: Lars Balker Rasmussen <lars@balker.dk>