Merge branch 'preserve-link-headers' into 'develop'

Preserves parameters in link headers

Closes #716

See merge request !908
2 jobs for develop in 3 minutes and 20 seconds (queued for 1 second)