Use shortlink in feed for trackability
Merge branch 'shortlink-in-feed'