Merge "Add time_offset=<UTC offset> to mount arguments" into main