diff --git a/modules.conf b/modules.conf
new file mode 100644
index 00000000000..e33333869ab
--- /dev/null
+++ b/modules.conf
@@ -0,0 +1,173 @@
+#applications/mod_abstraction
+applications/mod_av
+#applications/mod_avmd
+#applications/mod_bert
+#applications/mod_blacklist
+#applications/mod_callcenter
+#applications/mod_cidlookup
+#applications/mod_cluechoo
+applications/mod_commands
+applications/mod_conference
+#applications/mod_curl
+#applications/mod_cv
+applications/mod_db
+#applications/mod_directory
+#applications/mod_distributor
+applications/mod_dptools
+#applications/mod_easyroute
+applications/mod_enum
+applications/mod_esf
+#applications/mod_esl
+applications/mod_expr
+applications/mod_fifo
+#applications/mod_fsk
+applications/mod_fsv
+applications/mod_hash
+#applications/mod_hiredis
+applications/mod_httapi
+applications/mod_http_cache
+#applications/mod_ladspa
+#applications/mod_lcr
+#applications/mod_memcache
+#applications/mod_mongo
+#applications/mod_mp4
+#applications/mod_mp4v2
+#applications/mod_nibblebill
+#applications/mod_oreka
+#applications/mod_osp
+#applications/mod_prefix
+#applications/mod_rad_auth
+#applications/mod_redis
+#applications/mod_rss
+#applications/mod_signalwire
+applications/mod_sms
+#applications/mod_sms_flowroute
+#applications/mod_snapshot
+#applications/mod_snom
+#applications/mod_sonar
+#applications/mod_soundtouch
+applications/mod_spandsp
+#applications/mod_spy
+#applications/mod_stress
+applications/mod_test
+#applications/mod_translate
+applications/mod_valet_parking
+#applications/mod_video_filter
+#applications/mod_vmd
+applications/mod_voicemail
+#applications/mod_voicemail_ivr
+#asr_tts/mod_cepstral
+#asr_tts/mod_flite
+#asr_tts/mod_pocketsphinx
+#asr_tts/mod_tts_commandline
+codecs/mod_amr
+#codecs/mod_amrwb
+codecs/mod_b64
+#codecs/mod_bv
+#codecs/mod_clearmode
+#codecs/mod_codec2
+#codecs/mod_com_g729
+#codecs/mod_dahdi_codec
+codecs/mod_g723_1
+codecs/mod_g729
+codecs/mod_h26x
+#codecs/mod_ilbc
+#codecs/mod_isac
+#codecs/mod_mp4v
+codecs/mod_opus
+#codecs/mod_sangoma_codec
+#codecs/mod_silk
+#codecs/mod_siren
+#codecs/mod_theora
+#databases/mod_mariadb
+databases/mod_pgsql
+dialplans/mod_dialplan_asterisk
+#dialplans/mod_dialplan_directory
+dialplans/mod_dialplan_xml
+#directories/mod_ldap
+#endpoints/mod_alsa
+#endpoints/mod_gsmopen
+#endpoints/mod_h323
+#endpoints/mod_khomp
+endpoints/mod_loopback
+#endpoints/mod_opal
+#endpoints/mod_portaudio
+endpoints/mod_rtc
+#endpoints/mod_rtmp
+endpoints/mod_skinny
+endpoints/mod_sofia
+#endpoints/mod_verto
+#event_handlers/mod_amqp
+event_handlers/mod_cdr_csv
+#event_handlers/mod_cdr_mongodb
+#event_handlers/mod_cdr_pg_csv
+event_handlers/mod_cdr_sqlite
+#event_handlers/mod_erlang_event
+#event_handlers/mod_event_multicast
+event_handlers/mod_event_socket
+#event_handlers/mod_fail2ban
+#event_handlers/mod_format_cdr
+#event_handlers/mod_json_cdr
+#event_handlers/mod_radius_cdr
+#event_handlers/mod_odbc_cdr
+#event_handlers/mod_rayo
+#event_handlers/mod_smpp
+#event_handlers/mod_snmp
+#event_handlers/mod_event_zmq
+#formats/mod_imagick
+formats/mod_local_stream
+formats/mod_native_file
+formats/mod_png
+#formats/mod_portaudio_stream
+#formats/mod_shell_stream
+#formats/mod_shout
+formats/mod_sndfile
+#formats/mod_ssml
+formats/mod_tone_stream
+#formats/mod_vlc
+#formats/mod_opusfile
+#languages/mod_basic
+#languages/mod_java
+languages/mod_lua
+#languages/mod_managed
+#languages/mod_perl
+#languages/mod_python
+#languages/mod_python3
+#languages/mod_v8
+#languages/mod_yaml
+loggers/mod_console
+#loggers/mod_graylog2
+loggers/mod_logfile
+loggers/mod_syslog
+#loggers/mod_raven
+#say/mod_say_de
+say/mod_say_en
+#say/mod_say_es
+#say/mod_say_es_ar
+#say/mod_say_fa
+#say/mod_say_fr
+#say/mod_say_he
+#say/mod_say_hr
+#say/mod_say_hu
+#say/mod_say_it
+#say/mod_say_ja
+#say/mod_say_nl
+#say/mod_say_pl
+#say/mod_say_pt
+#say/mod_say_ru
+#say/mod_say_sv
+#say/mod_say_th
+#say/mod_say_zh
+#timers/mod_posix_timer
+#timers/mod_timerfd
+xml_int/mod_xml_cdr
+#xml_int/mod_xml_curl
+#xml_int/mod_xml_ldap
+#xml_int/mod_xml_radius
+xml_int/mod_xml_rpc
+xml_int/mod_xml_scgi
+
+#mod_freetdm|https://github.com/freeswitch/freetdm.git -b master
+
+## Experimental Modules (don't cry if they're broken)
+#../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 1452a7cf0fc..fd0e63f2d1b 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -925,6 +925,11 @@ char *sofia_glue_get_extra_headers(switch_channel_t *channel, const char *prefix
 				stream.write_function(&stream, "Geolocation: %s\r\n", value);
 			}
 
+			if (strstr(name, "sip_h_Identities")) {
+				stream.write_function(&stream, "Identity: %s\r\n", value);
+				continue;
+			}
+
 			if (!strncasecmp(name, prefix, strlen(prefix))) {
 				if ( !exclude_regex || !(/*proceed*/ switch_regex_perform(name, exclude_regex, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
 					const char *hname = name + strlen(prefix);