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