Merge "Add namespaces into mapping list" into main