Remove warning.
Merge remote-tracking branch 'upstream/hds' into hds