Merge "Clean up ScriptGroup2 implementation"