wms handling changed
Merge branch 'wms' into 3.0-design