Merge "Add native namespaces to mapper" into main