Merge remote-tracking branch 'public/pr/1559' into development-proposed

* public/pr/1559:
  Make the memset call prior to FD_ZERO conditional to needing it