fix browser test
Merge unstable into browser