Re-generate cluster namespace (part 2)

Re-generate cluster namespace (part 2) #882