Merge pull request #5428 from kumpera/wasm-support-p2