Merge branch 'dev/control-ioctl' into for-chris-4.6