Merge branch 'master' into PR/simplify_emscripten