Updated build and pack Powershell
Merged