Am reopening the pull request for the ssl-safe changes based on 1.07.