Merge "Correct comments for scan order neighbors"