Merge branch 'develop' into as2wasm