Merge remote-tracking branch 'danvk/292-squash' into utc_datetime_labels-issue_498-v2