FORGE-1665: Fixed BOM issues