[MERGE] Merge from trunk-wms