[582988] Preserve timestamp, tidy
8 files changed