Fix mistake at merge
Merge branch 'upgrade-fix' into cim