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

* commit '2ee5fe77db4f3269f538272231de24786c112f1d':
  Refactoring push reordering (issue 7139335)