Merge "Move to new Fstab class"