Merge canonical source timestamp timezone fix from main into test