Merge "Fix default timestamp in upgrade script"