Merge "Show time zone used in or after 2018 only" into pi-dev