Merge part 2 of branch 'sysfs-devel'