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