ViewObject Comment fixed for new structure
Merge origin/ListPanelUpdate into ListPanelUpdate
ViewObject Alarm fixed for new structure
Merge origin/ListPanelUpdate into ListPanelUpdate