Merge "add namespaces to the native list" into main