Merge "Improve performance for sp<> on stack"