Merge "Update Dispatch table following ScriptGroup2 API change."