Reset views to 0
Merge with 'origin/fix-maps-fixtures'