Merge "Update the timestamp used for time zone filtering"