Resolve merge conflct.
Add control map/import.
Fix for checking whether cell derives from LinksHandler.