Merge "Reformat scan order neighbors" into nextgenv2