Merge branch 'cherry-pick-888ca64b' into '2024Q2_RC'

fix for #40

See merge request !31
2 jobs for 2024Q2_RC
in 2 minutes and 9 seconds, using 0 compute credits, and was queued for 2 seconds