Merge "Report WPS overlap error" into honeycomb