Merge "Add another namespace to mapper." into main