Thanks @gubbins @hmhealey
I’ll close this off here for now and we can track via the Jira ticket linked above.