[Module Tag script: core 12.0.16]
Merge branch 'release/12.0' into release/13.0