Hot fix
Merge branch 'hotfix' into dev