[CLC-1720] Roll up fixes into QA: