Fix packages path for smartcard features
Merge