Merge "Localize namespaces to inh"