Merge branch 'js/larger-timestamps'