[ORD] Plan annotation moving/regenerating

OpenRoads Designer CE - 2021 Release 2 - Version 10.10.21.04

I thought I had read here that 2021 R1 had solved the issue with Annotation resetting its location after it had been moved.

Here is the annotation immediately after placement:

Here is the annotation "cleaned up" for readability, etc.:

I needed to make an adjustment to the Named Boundary. It appears to be just a shape in the design file, so I Modified it, and Updated the Saved View Settings. It did update the drawing model to the corrected shape, however, it moved the attachment. I reset the Attachment Offset back to 0,0. This put the saved view attachment back to where it belonged, but it relocated and regenerated all of the annotation:

I know, the answer is to make all adjustments to the Named Boundaries before doing anything to the plans...

Aside from that, is there any way to stop the annotations from regenerating? Is there a way to "disassociate" them from the saved view while still keeping the field values?
Thank you.