Merge branch 'fix/1991-tzdata-update' into 'develop'