Merge maplink and move-links preprocessing steps #1714