Merge "Add NAMESPACE_NEARBY String"