Merge "Revert "Revert "Don't implicitly add test tags to all elements a..."" into main