Merge "Recognise insecure encryption with a new constant"