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

* commit '579a34186f801f7d70ac05feb380b1a3480e6d31':