Merge "Polish updates" into sc-dev