Fixing neighbors hell
[backport] Fix limit case for non existant neighbors
Merge branch 'master' into stable