Merge "Update and fix ScriptGroup for outputs to globals" into mnc-dev