[20170306140228] EBS Encryption and General Improvements