PM: Update from CAF jb_chocolate