Merge "Implement issue #34842682: Add ability to limit permissions based on features"