Merge to master - deployment script updates