issue #923
Merge branch 'hotfixes' into develop