K3.1 Crypsis fix merge