Merge model updates from gb2
Merge view updates from gb2