Changed theme to develop in dev mode.
Merge branch 'hotfix-1.8.4' into develop