Merge "Artifacts in CSAR" into release-1.1.0