Merge branch 'mg/timestamp-t-fix' into maint