Merge "Fix end alignment of grid" into lmp-mr1-dev