Merge pull request #3312 from nabinhait/develop

[fix] operations and bom