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

* commit '806bb8de02428e53992880be77ebae7ac4a01ec3':