User feedback
Merge branch 'editthread'