[bom] [fixes] fixes in bom
Merge branch 'master' into edge