3.1 Crypsis: Fix merge issues