adding web arena support
Merge branch 'release/1.5.1'