Merge "Enable rectangular partition search for speed 1"