Extracted message handlers preparing to introduce SSL
conflict
Extracted message handlers preparing to introduce SSL