Merged in SSL validation support for 2.4, backward compatibile