Merge pull request #4995 from nabinhait/develop

[fix] BOM Browser