Merge branch 'feature/allow-link-rel-attribute' into 'develop'