Merge "Fix bugs in scriptGroup." into jb-mr1-dev