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

* commit 'cbe28fb700d18b2ab2348534c2ccafb035382dc5':