am 7fa3bb67: am 17e3cdc2: Fix ScriptGroup performance regression

* commit '7fa3bb67eea14f276932db0a15b1fdecb3fefb7e':