CLC-1757 for QA branch for release 9

CLC-1757 for QA branch for release 9
New commit with the consolidated changes from the last three CLC-1757 changes to master.