am cbe7025e: am cbe28fb7: am 579a3418: am 35ef6aae: am 0655904a: Fixing regression in reordering (issue 10994971)

* commit 'cbe7025e590b93d98d344ee845991f665b38df3b':