Feedback window, fixes #375
Merge branch 'master' into builds
7.878