Merge branch 'bugfix/activitypub-public' into 'develop'