Merge change 20898

* changes:
  The triumphant return of the shell scripts, with bugreports, less code dup, and enhanced readability.