Upstream view templates updates.