Cherry-pick !78275 into 23.0.20-patches

As discussed in the original MR, this is needed for the mc23a production.

See merge request !78275 (merged)

cc: @jchapman, @tamartin

merged

mentioned in commit 9a957537