Merge branch 'rename/pleroma_activity_consistency' into 'develop'