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

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