Forward port of issue #26946 to 2.5.x.
Activity
Merge branch '2.4.x' into 2.5.x
Logically reorganize methods in ScriptUtils
Deprecate internal APIs in ScriptUtils