Merge "Fix issue with non-matching timestamps due to local timezone." into main