Merge tag 'codeclimate' into develop

codeclimate
codeclimate
Merge branch 'hotfix/codeclimate2'
Merge tag 'codeclimate2' into develop

codeclimate2