issue #926
Merge branch 'hotfixes' into develop