modularizing ci-build
merge unstable into browser - modularizing ci-build