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

* commit '8372a63897a8b2b5d73fafb5e9185d80312a69c8':
  Refactoring push reordering (issue 7139335)