Merge "Fix wp and sp comparison bugs"