Merge "Allow for input_data on finish."