This is the same patch as before, with the fixes mentioned on the list. Also, includes a bugfix patch to device_parsing.c that is triggered by the main patch, but was unnoticed until now.