bound bug-fix
Merge branch 'hotfix' into develop