Merge "Revert "Fix wp and sp comparison bugs""