Merge branch 'feat/340-cttc-fix-ci-cd-pipeline-jobs-after-multiple-merges' into 'develop'
Resolve "(CTTC) Fix CI/CD pipeline jobs after multiple merges" See merge request !399
Resolve "(CTTC) Fix CI/CD pipeline jobs after multiple merges" See merge request !399