latest changes for map fields
merge conflict