This has now been delivered - I’ve marked this completed
However, there remains a need to extend this a bit further: