Merge "Fix potential issue while install CSAR"