Merge branch 'cherry-pick/r2_11_2_JAL-3509' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 2 Sep 2021 14:34:48 +0000 (15:34 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 2 Sep 2021 14:34:48 +0000 (15:34 +0100)

Trivial merge