Disabled encryption
merge fixed