Merge branch 'nsfs-ioctls' into HEAD