Merge change 2636

* changes:
  Add support for setting scripts, rather than having a hard-coded script.