Merge "WPS fixes and refactor"