bug #2630: only process domains with information

(cherry picked from commit ec3ec7f768178851fb7bb9f013a36ceb12d96cc0)
Merge remote-tracking branch 'upstream/one-4.4' into one-4.4