1.8.2
Merge branch 'hotfix/1.8.2' into develop