Merge "Fix a bug with compat lib support. Add new namespace to sp<>."