Merge "Adding logging for generateLinks"