[Product] Add missing changes after rebase