Merge 6a30d4e5b0e55823c8f6b2ff73f985addcdb80b0 into backport/aslamovamir-hvt-33603-normalize-start-date-export/amazingly-nice-dassie