am af380bbf: am 8372a638: am 2ee5fe77: Merge "Refactoring push reordering (issue 7139335)" into jb-mr1.1-dev

* commit 'af380bbf61b0cef18f574d629d480cd9f7a32843':
  Refactoring push reordering (issue 7139335)