convert outgoing links
merged in creation branch
Merged from API-dev
Continuing merge