Hello @Mark Taylor (PIHV)
Since we are working on this issue internally, we will close this thread at this moment. I will share general soluntion for this topic latter to public for reference.
-Please kindly accept the answer if you feel helpful to support the community, thanks a lot.
This issue is currently under internal discusstion with op and product team.