CB-7963 Adds support for browser platform