synchronizes with recent changes in Namer in 2.11.x