Merge branch 'webfinger-mocks' into 'develop'