rebase on original ktimezoned implementation