Merge "Add SHA256 key management definition"