Merge branch 'hotfix/2.3.0'
Merge branch 'release/2.5'
fixing external browser case
Merge branch 'hotfix/2.5.1' into development