Merge "Use vfat for timestamp"