Merge "Addition of new time zone lookup code"