Using a better canonical uri
Merge branch 'mbst-8913-rte-feed' into stage