Andy's request merge for sending history