release/21.0.20.16

Stefan Richter

@strichte

4a510421 · Merge branch 'cherry-pick-f9725df0' into '21.0-mc16a' · May 11, 2023

Needed for ATLMCPROD-10493
Release request ticket: ATLMCPROD-10493