From syddjurs asswell in dev.
Merge branch 'hotfix-1.8.4' into develop