Merge "Use 0 for sp<>, NULL for raw pointers"