Merge encryption modules from Mylar