Merge "[dice] Refactor get_input_values_vector / make_input_values"