Backporting multi moderation fix
Back-ported fix roundup