Merge pull request #23783 from arjantijms/tags300

Integrate Tags 3.0.0-RC1/M1.