Merge remote-tracking branch 'origin/cherry_pick_binstub_fix' into merge-cherry_pick_binstub_fix