Merge branch 'udev' into develop