Merge branch 'topic-tilesize-cleanup'