Merge "Fix SSL bind condtions"