Merge branch 'hotfix/1.1.5'
Remove duplicated code
Merge branch 'hotfix/1.1.6' into develop