cherry-pick fixup