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