Merge AuthEnc and Calico modules