Merge "New shader parameters" into sc-dev