Previewbuildscript2

Bring in rebased changes.  Reverse Pull request FTW