fix browser annotations
Merge branch 'release-1.0'
Merge branch 'release-1.0'