History 0030-merge-cleanup-and-pre-pivot-cleanup-hooks.patch