Fix bug 26747
Fix bug 26747 (again)
map:new renamed map:merge