Notes on namespace searches
Merges in master