Merge pull request #2487 from nabinhait/fix1

Fixed bom patch