Merge "Fix sp<> conversion operator / constructor"