Fix for PropertyMappings where a later BOM property would override an earlier