Fix 'cannot add problem to view'
Merge remote-tracking branch 'origin/master'