Issue ARM-13 to djmitche for SSL Behaviour