Merge "Replace new with sp<>::make"