Fix API inconsistencies

Created by: njoyard

Include API fixes from d-r-v and d-r

Merge request reports

Loading