Fixed gview_cds errors
Merge branch 'devel'