Fixup

5 jobs for !3179 with feature/cc-parallel-gvv-update
latest merge request