Merge pull request #1049 from tweise/hds

Include in-flight data.
Remove warning.
Merge remote-tracking branch 'upstream/hds' into hds
Fix test