am 17e3cdc2: Fix ScriptGroup performance regression

* commit '17e3cdc24776d8fdbf1ce16287b9b4dcd516708f':
  Fix ScriptGroup performance regression