Merge "GenericSource: use sp<> instead of regular pointer."