Co-authored-by: Nick Pope <nick.pope@flightdataservices.com> Backport of eee4da3b5748370a5c562bc63d2cae61ea85b16c from master
Co-authored-by: Nick Pope <nick.pope@flightdataservices.com> Backport of eee4da3b5748370a5c562bc63d2cae61ea85b16c from master