api-fixes.patch
