issue #909
Merge branch 'hotfixes' into develop