Backport of 9c19aff7c7561e3a82978a272ecdaad40dda5c00 from main.
Co-authored-by: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> Co-authored-by: Nick Pope <nick.pope@flightdataservices.com>
Thanks Nick Pope for much review.