Merge "Fix patch generation timestamps"