fix external app build
merge unstable into browser - fix external app build