Merge "Software Encryption issue fixed"