Merge "Fully rewrite existing change and do not amend"