issue #718
Merge branch 'hotfixes' into develop