Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev