Merge "Get the correct fstab entry if there are more than one" into main