Merge "Add a command line option to optimize individual splits"