[1.1.x] Avoid infinite loop on summarize() (#2784)

[deniszh]

Backport

This will backport the following commits from master to 1.1.x:

• Avoid infinite loop on summarize() (#2784)

Questions ?

Please refer to the Backport tool documentation