Merge branch 'complexity_measurement_crashes_fix' into 'main'

Fix for complexity measurement CI pipeline crashes

See merge request !1558