Merge "Refactor the model for rect partition pruning"