Copied Stage 1 Templates To Stage 2.

Copied all the upstream modifications to stage 2