Lipski's view fix
Merge remote-tracking branch 'origin/master'
Lipski's view fix