CLC-1757 for QA branch for release 9

CLC-1757, updated commit for QA branch that includes the changes from the last three commits for master.