Drainage Annotations not Updating to Correct Feature Name - ORD CE 2021 R2

We have a client-supplied workspace (FDOT) with annotation groups and definitions that will annotate the drainage nodes and conduits in profiles. All well and good. However, we have noticed (mostly with the conduits/pipes) that the annotation is pulling the wrong Feature Name. I have run into this same issue when setting up an annotation from scratch, so don't believe it is workspace-related. 

Here is a perfect example. This link is named P-105. All properties show that EXCEPT when we use the Text Favorite Manager to select the element to populate the Feature Name property. Here you can see that the Feature Name property is showing as P-106. Literally everywhere else we check, it is set to P-105. The profile annotation is labeling as P-106 instead of P-105. 

If I select the link in profile (plan, and 3D for that matter) it shows correctly as P-105. You can see here that the annotation in the profile shows P-106 incorrectly.

This is just one example but it has shown up on multiple pipes and in different projects. Has anyone encountered this and is there a fix in 2021 R2? 

Or is this something that was captured under the Defects Fixed in 2022 R1 here?