Merge branch 'tg/next/0.4_anon_contrib_nsfw' into next