am d30ac9b9: am 5b6de8cb: Merge "Improve reordering by always using the "push mechanic" if possible (issue 6275309)" into jb-dev

* commit 'd30ac9b9d85dd43b11d5a7ff685f68db81c3fb35':
  Improve reordering by always using the "push mechanic" if possible (issue 6275309)