[Observe-commits] 22/34: Fix generic