Merge branch 'develop' into 474-add-support-for-canonical-urls