Merge "Style updates" into sc-dev