[Product] Add missing changes after rebase

@pjedrzejewski This adds another missing changes to API that disappeared after your rebase, also fixes #2069.