Import ccid-1.4.16 from upstream