fix: #3625824 Tags not always tokenized before merge.

Ted Cooperrequested to merge
issue/views_advanced_cache-3625824:2.x-3625824-row-tokens into 2.x

These are the actual code changes.

Merge request reports