Merge "[12/n] Fix tiling bug causing crash because of HSUM" into main