Merge "Avoid creating sp<> from a pointer"