issue #948
issue #947
Merge branch 'hotfixes' into develop