Merge branch 'upload-timestamps'