This merge was necessary because cfulist_delete_data_with_free_fn is directly related with the free_fn functionality.