Revert "Revert "Merge remote-tracking branch 'origin/master' into fix/nsfw-attachment-propegation-1443"" This reverts commit f92bb0b9.
