CONN-127

Please **DO NOT** merge it. Connection team will do that once the changes are code reviewed and QA'ed.