Merge "Set new default tiles" into sc-dev