Wps 10

Merging WPS branch with the master,