Merge "Updated settings for new get/set feature change" into sc-dev