[#73508130] Update BpProduct match_fields