try not to process duplicate updates
fix template issue
Merge branch 'hs_staging' into hs_stable