Here's the PR I submitted for calcom/cal.com https://github.com/calcom/cal.com/pull/24266

I'm working to resolve some of the coderabbit mentions this morning. I'll see if I can get those merged shortly.