Restore better anchor support while maintaining backward compatibility

caseyrequested to merge
issue/linkit-3022261:3022261-anchor-support-bc into 6.1.x

Related to #3022261

Merge request reports