Merge updates from ebi-ait repo before archiving it

[jamesamcl]

PR created as part of zoom discussion with @amnonkhen and @ESapenaVentura after agreement with @tburdett that we should consolidate on this repo rather than ebi-ait.

https://docs.google.com/document/d/1Wol-xTUCLYLGmd3kDUi-h9zgfoSpFM9BTn3rhsHo37U