cherry-pick functionality check