sug-401 enrichment for names disabled
sug-401 enrichment for names disabled (merge)
Merge branch '4.5' into 4.6