Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'