Manual merge of other branches

Merge in the changes made to the live script through the sandbox.  Bumping this up to Sandbox with a pull request.