am f34ba456: Merge "Modify script loading behavior."

* commit 'f34ba4568ba9769fd87ad24a33dfcef027e15401':
  Modify script loading behavior.