issue #918
Merge branch 'hotfixes' into develop