fixes #534
fix for #525
fixes #533
Fixes Issue #536
Merge branch 'hotfixes' into stable