Merge pull request #5668 from kumpera/wasm-work-p4