Merge branch 'neigh-get-support'