Merge "Fix DirectReply bug when reapply fails" into nyc-dev