CONN-953 QA Fixes
Merge pull request #721 from sailajaa/CONN-953Fix

CONN-953 QA Fixes