Merge "Limited use key: feature files" into sc-dev