bugfix feedback
Merge branch 'master' into release