minor changes
Merge branch 'master' into UnstableFeedback