Merge "Fix WPS string" into jb-dev