Merge pull request #13220 from totten/master-tz-backend