Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'