Merge branch 'hotfix/codeclimate'
Merge branch 'release/v0.11.7'
Merge branch 'release/v0.11.7'
remove duplicate code
remove duplicate code
Merge branch 'master' into develop