Merge branch 'hotfix/2.1.2'
Closing hotfix branch 2.1.3.
Merge branch 'hotfix/2.1.3' into development