Merge "Move allowGeneratedReplies to Action" into nyc-dev