Merge "[1/n] Adding tiling session persistence to the repositories" into main