Merge "Add fpc to vendor list"