issue #896
Merge branch 'hotfixes' into develop