Merge pull request #1984 from tmccombs/comment-ai-policy