Merge branch 'hotfix/hotfix'
Dashboard span fix
Language fix
Merge branch 'hotfix/hotfix' into develop