Merge "rename config_settingsIntelligencePackageName" into tm-dev