Merge "Fix choose_partitioning threshold setup for speed -5"