chore(merge): cherry-pick commit 0cd2872