Merge branch '21.0-mc16d-cherry-picking-27086' into '21.0-mc16d'
Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705) See merge request atlas/athena!39595
Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705) See merge request atlas/athena!39595
mentioned in commit da32645b
·mentioned in commit da32645b