Cross Section Annotation - Collision Free Leader Length Clipping - OpenRail Designer CE 2021 Release 2

I'm using OpenRail Designer CE 2021 Release 2.

Trying to do cross section annotations, incorporating collision free.
I'm running into a couple issues depending on two different approaches. There was an enhancement request put in ~2 years ago according to this post on the Bentley forums, I’m not sure if its been incorporated into recent releases: Framed annotation with collision shift in OPEN ROADS - OpenRoads | OpenSite Forum - OpenRoads | OpenSite - Bentley Communities

Is there a fix or workaround for either of these? Ideally, I would want my annotations entirely within the frame, with my leader line clipped to my slant line. If I could also get another vertical line in between my offset and elevation, starting where the clipped line is, that would be great.

  1. Leader line does not clip to where shift line begins/ends, and just runs to top of frame.

2. Leader line runs towards bottom of frame, regardless of where my annotation text ends up being (highlighted in red).