Merge pull request #833 from christophermay07/CONN-1191

CONN-1191
CONN-1191: Fixed unresolved merge conflicts