Merge branch 'dm/ni-maxhost-may-be-missing' into next