Merge "Don't use sp<>&" into nyc-dev