Merge "Use 0 not NULL for sp<> and wp<>"