Fixed null domain suggestions
Merge commit 'eed7c474a4439412685540fb3ab12c58c178a0ac'