Cherry-pick !67107 into 23.0
As discussed in ATLMCPROD-11590. Assuming this works, we need to cherry-pick into 23.0.20-patches as well.
See merge request !67107 (merged)
cc: @jchapman
As discussed in ATLMCPROD-11590. Assuming this works, we need to cherry-pick into 23.0.20-patches as well.
See merge request !67107 (merged)
cc: @jchapman