am 157b263e: am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit

* commit '157b263ef9fd463beca54be2ed4267ae022a9542':
  Don't load items which exceed the grid bounds