Merge "Enhance the ioctl toolbox command"