[Observe-commits] 09/16: fix cherry-pick