Same change for main branch as it was done for 21.2: MR !74098 (merged)
tagging ey software conveners @mungo @fnechans, e/y conveners @ludovica @kristin @ahabouel, ey calibration @gunal.