Merge "Split shade should always have 6 tiles"