Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13

Merge-request: !2464