don't overwrite tail of log
Merge branch 'master' into hs_staging