Merge branch 'sysfs' into release