To be addressed in 7.21.5
=========================

271 - fix the IPv6-working probing to only exist at one place in the code and
      only get done once

272 -