Thread: AP-patch preservation