Inclusion timer may be too short for larger networks

Just an observation when trying to include a new Fibaro Door Sensor (FGDW-002) with Paper-UI or Habmin:

The default inclusion mode timeout of 30 second may be too short for larger networks, as in the first phase the ZwaveDiscoveryService always checks all exisiting nodes first, before it starts with the discovery of new nodes. In my network with 40 nodes no time was left for this discovery phase, as the first phase already took more than 30 seconds. After changing the inclusion mode timeout to 60 seconds inclusion of the new sensor worked fine.

May be the inclusion timer should timeout only the second discovery phase of the inclusion process?