Merge ccid_driver_improvement branch. (backport)