Merge "add namespace to native mapping" into main