issue #681 improvements
Merge branch 'hotfixes' into develop