Merge request: https://gitlab.riscosopen.org/RiscOS/Sources/Networking/AUN/Apps/GateWay/merge_requests/1