Merge "Change divider between framework and TileServices" into sc-dev