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