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