Merge commit 'refs/top-bases/t/js/localtz' into t/js/localtz