merge kernel module fix from r18295 to 8.09