Merge "fix ubuntu key"