Merge branch 'fix/activitypub-user-view-badmap' into 'develop'