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