Merge "Add namespace to mapper." into main