Merge branch 'hotfix/2.1.1'
pass the arguments as well
updated the changelog
Merge branch 'hotfix/2.1.2' into develop