issue #962
Merge branch 'hotfixes' into develop