Merge view updates from gb2
Merge route updates from gb2