@1782694 Port iterator change to the main branch too.
@1782694 Port iterator change to the main branch too.

tsuna/EosSdk,aristanetworks/EosSdk,tsuna/EosSdk,tsuna/EosSdk,leopoul/EosSdk,aristanetworks/EosSdk,aristanetworks/EosSdk,aristanetworks/EosSdk,leopoul/EosSdk,leopoul/EosSdk,tsuna/EosSdk