First check the new PB API (related to issue 6168)