https://stfc.atlassian.net/browse/STFCCLOUD-7030

https://stfc.atlassian.net/browse/STFCCLOUD-5975

https://stfc.atlassian.net/browse/GSTSM-81