Merge branch 'features/add-credo-to-ci' into 'develop'