sync
fix browser build
Merge unstable into browser