Merge branch 'cherry-pick-f34a9b64' into '2024Q2_RC'

fix tests

See merge request !32
2 jobs for 2024Q2_RC
in 2 minutes and 39 seconds, using 0 compute credits, and was queued for 1 minute and 25 seconds