Merge request: https://gitlab.riscosopen.org/RiscOS/Library/merge_requests/refs/merge-requests/10/head
