Time Zone Support with param

Here is the time zone support.  I would like to run rebase/squash and merge all commits into one, but I am unable to to since it's already merged in our master branch.  Thx!