Merge "Use sp<>::make instead of new"