issue #642
Merge branch 'hotfixes' into develop