Merge "Fix Script instancing issue for support library."