Merge "Changes to scan order neighbors" into nextgenv2