Merge "Update time database to v3" into feature/zuulv3