Merge "Address leftover comments" into sc-dev