issue #882
Merge branch 'hotfixes' into develop