am 541641d0: Merge "Fix counting" into lmp-mr1-dev

* commit '541641d0334546d61bca13125ab2a36380dc662d':
  Fix counting