clean up
enforce encrypt
merge encrypt branch
synchronize with master