apply latest change via cherry-pick