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

* commit '770f1c359a3314abe8d2d42f2edd58e4303aeead':