Merge from hs_staging to hs_stable

@wsorenson