Merge branch 'hotfix/rest-links'
Updated to PhlyComic@d96ee4f11
Merge branch 'hotfix/phly-comic' into develop