[scan-9] Update enumeration logic (#3626)

[scan-9] Update enumeration logic (#3626) #9246