use new deploy API correctly
Merge branch 'hs_staging' into hs_stable