Merge branch 'fix/ci-use-correct-skipped-target' into 'master'

Fix/ci use correct skipped target

See merge request !2619
4 jobs for !2616 with cherry-pick-346d4efe
latest merge request