Merge remote-tracking branch 'alon/pull-libcacard-1' into staging