Merge branch '2.0' into 'master'

Further cleanup and rewriting

See merge request extensions/wsspaces!1
2 jobs for v2.0.1 in 15 seconds (queued for 6 seconds)
latest