Merge branch 'develop'
Release v1.8.4
Merge branch 'master' into develop