Changes to 3.1 Self Encryption