am 81440ebf: Merge "Move mark stack lock up in ordering"

* commit '81440ebf97634261b74a4235d3af017ffce226a5':
  Move mark stack lock up in ordering