Merge dtmcreation_add_recursive_find into develop