Merge "Fix indent in choose_partitioning"