Merge 2 way ssl from 3-5-stable
version bump