[DF-185] Merge cherry-pick