Add changes for cert pinning support