Added cpc for continue cherry-pick