Merged app_config and email_client