NXP-13594: Explicitly add missing facets