issue #860
Merge branch 'hotfixes' into develop