Improving border handling in composition of position fields
Removing unnecessary (and non functional) call to squeeze
Merge branch 'map_coordinates_bug-3'