Rebase from 'upstream'
add disable ssl