enforce encrypt
merge encrypt branch