Merge "Fix API for C compatibility"