Merge "Move new script group API into ScriptGroup"