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

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