Added native services to components in settings
Merge branch 'master' into fha-next