Merge "Initial implementation of generateLinks"