Merge "Rework partition search skip scheme"