updated views
Merge commit '1a1600955f775a539feed4555cfd43b46f2f40e0' into 7.x-stable