Sweeping !39595 from 21.0-mc16d to master. Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705)
Cherry picking !27086 (merged) in 21.0 mc16d (ATLPHYSVAL-705)
See merge request !39595 (merged)
Cherry picking !27086 (merged) in 21.0 mc16d (ATLPHYSVAL-705)
See merge request !39595 (merged)