Merge pull request #3015 from spnda/remove_nv_c_interface