Merge "[NS03] Mix in other CS-managed properties" into sc-dev