Merge branch 'fix/credo-issues' into 'develop'