More Script Work
Merge pull request #3560 from Martin-Grunewald/MoreScriptWork

HLT -- More Script Work