Merge "Add WPS details for certification" into jb-dev