Merge "Make sure the correct QS tiles are used for Provider Model" into sc-dev