Fix for broken feedback, as reported by Mona Demaidi
Merge branch 'release-v2.1'