Merge "Allows fallback to matching by name for older kernels without UNIQ." into main