master branch
fix #CER-00 group view fix