issue #929
Merge branch 'hotfixes' into develop