Merge "Fix counting" into lmp-mr1-dev