[fix] issue when cobj doesn't exist
Merge branch 'master' into work