Merge "Enable ssh validation by default"