Merge pull request #5560 from kumpera/wasm-work-p3