Applied first patch with new ioctls