Make user feedback work again.
Merge branch 'hotfix/1.3.5'