Wps 3.1.0 maintenance

merge 3.1.x maintenance branch