Add info for no feedback
Merge branch 'front_end'
Fix merge conflict for views