I consider issue 1 to be more critical because, after observing a phone running for some time, I've been able to roughly estimate the portion zeromap can help save using only PSWPOUT, ZSWPOUT, and SWAPOUT_SKIP, even without a SWPIN counter. However, I agree that issue 2 still holds significant value as a separate patch. Thanks Barry