Clc 1220 version enhancements qa

QA branch version of same commit from #661