Merge branch '12-update-gitlab-ci-file-to-use-inherited-jobs-from-main' into 'develop'

Resolve "Update gitlab CI file to use inherited jobs from main"

See merge request !20