am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev

* commit '8d0c431a5284a7374b889b9b719e88ba993469f9':
  Fix bugs in scriptGroup.