Sort s3 logs
Merge branch 'master' into hs_staging