4 Commits (mercator_fix)