nbd/no-return-nonvoid.patch