Merge "Check for IOCTL feature changed to not set inheritence"