dont mess with view contents.
Merge branch '4.0'