View and Compare fix
Merge branch 'dev'