Merge branch 'fix/remove_auto_nsfw' into 'develop'