This MR complements !195 (merged) and should be merged after pleroma!3348 (closed) is merged
Blocked by pleroma!3348 (closed)