Merge "Revert "Update calls to go through the feature interface instead..."" into sc-dev