Merge branch 'PR/simplify_emscripten'