Task #254: Changed view settings
Merge branch '254' into test