issue #723
Merge branch 'hotfixes' into develop