Merge pull request #5415 from kumpera/wasm-support