Merge "Add random key generation"