Views fixes
Merge remote-tracking branch 'origin/Alexey'