Merge branch 'jk/tzoffset-fix' into maint