Merge branch 'bugfix/webfinger-jrd' into 'develop'