Additional features mapping
Merge pull request #3124 from guardian/map-the-features

Additional features mapping