Merge branch 'tests/web_finger' into 'develop'