Merge pull request #3338 from rmehta/bom-multiple-add

BOM updates