Merging staging to master with update for prd cap deploy script