Merging upstream fixes

Thanks for putting the time to make this very convenient Pi version…

Would it be possible to merge fixes from the upstream repo?

Currently trying to debug an issue where a UUID present in my fstab file is not being detected (automount still mounts it a second time) and it would be useful ruling out anything that might have been fixed over the past year…