c116b6d6d6
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810