CONN-1355:Fix issue found in QA