cherry_pick_fix_2