Merge "DecryptHandle cleanup"