diff --git a/AndroidManifestLibrary.xml b/AndroidManifestLibrary.xml
index 08ac46283..51d751ad7 100755
--- a/AndroidManifestLibrary.xml
+++ b/AndroidManifestLibrary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.linphone"
+<manifest package="org.linphone.core"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
           android:versionCode="3303"
diff --git a/build.gradle b/build.gradle
index a042db4df..32a02359e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -110,6 +110,10 @@ android {
     release {
       signingConfig signingConfigs.release
     }
+    packaged {
+      initWith release
+      signingConfig null
+    }
   }
   sourceSets {
     main {
diff --git a/prepare.py b/prepare.py
index 2105492c6..5a0b26194 100755
--- a/prepare.py
+++ b/prepare.py
@@ -91,10 +91,14 @@ android_targets = {
     'x86_64': AndroidX86_64Target()
 }
 
+android_virtual_targets= {
+    'all': ['arm', 'armv7', 'arm64', 'x86', 'x86_64']
+}
+
 class AndroidPreparator(prepare.Preparator):
 
     def __init__(self, targets=android_targets):
-        prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64', 'x86'])
+        prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64', 'x86'], virtual_targets=android_virtual_targets)
         self.min_supported_ndk = 11
         self.max_supported_ndk = 16
         self.unsupported_ndk_version = None
@@ -219,6 +223,12 @@ clean: java-clean
 
 install: install-apk run-linphone
 
+install-test:
+\t$(MAKE) -C liblinphone_tester copy-libs
+\t$(MAKE) -C liblinphone_tester copy-files
+\t./gradlew -b liblinphone_tester/build.gradle assembleDebug
+\t./gradlew -b liblinphone_tester/build.gradle installDebug
+
 java-clean:
 \t./gradlew clean
 
@@ -340,6 +350,9 @@ uninstall:
 release: java-clean build copy-libs
 \t./gradlew assembleRelease
 
+unsigned: java-clean build copy-libs
+\t./gradlew assemblePackaged
+
 generate-sdk: liblinphone-android-sdk
 
 generate-javadoc:
@@ -350,6 +363,7 @@ liblinphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
 \t./gradlew -b libLinphoneAndroidSdk.gradle androidJavadocsJar
 \t./gradlew -b libLinphoneAndroidSdk.gradle sourcesJar
 \t./gradlew -b libLinphoneAndroidSdk.gradle assembleRelease
+\t@mv $(TOPDIR)/bin/outputs/aar/*.aar $(TOPDIR)/bin/outputs/aar/liblinphone-sdk.aar
 \t./gradlew -b libLinphoneAndroidSdk.gradle sdkZip
 
 linphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 54c7c9833..42b421acb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -110,8 +110,6 @@
   <string name="use_email_for_validation">استخدم عنوان البريد الإلكتروني لتأكيد الحساب</string>
   <string name="login_with_username">استعمل اسم المستخدم وكلمة السر عوضا عن رقم هاتفك</string>
   <string name="phone_number_info_title">لأي غرض سيجري استخدام رقم هاتفي ؟</string>
-  <string name="phone_number_info_content">
-\nبفضل رقم هاتفك، سيجدك أصدقاؤك بسهولة.\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n</string>
   <string name="phone_number_link_info_content">
 \nسيجدك أصدقاؤك بسهولة إن ربطت حسابك برقم هاتفك\\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n</string>
   <string name="phone_number_link_info_content_already_account">يمكنك استخدام رقم هاتفي واحد مع حساب لنفون واحد.\n\nإن ربطت رقم هاتفك مع حساب آخر لكنك تود استخدام هذا الحساب، يمكنك ببساطة ربطه مع رقم هاتفك تلقائيا وسيُنقَل هذا الأخير إلى هذا الحساب.</string>
@@ -454,5 +452,6 @@
   <string name="content_description_call_options">خيارات المكالمة</string>
   <string name="content_description_audio_route">توجيه الصوت</string>
   <string name="content_description_exit_conference">مغادرة الاجتماع</string>
+  <string name="content_title_notification_service">خدمة لِنْفُونْ</string>
   <string name="content_title_notification">إشعارات لِنْفُونْ</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e64a4e312..1a50481b8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -444,5 +444,6 @@
   <string name="content_description_call_options">Anrufoptionen</string>
   <string name="content_description_audio_route">Audioroute</string>
   <string name="content_description_exit_conference">Konferenz beenden</string>
+  <string name="content_title_notification_service">Linphone-Dienst</string>
   <string name="content_title_notification">Linphone-Benachrichtigung</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 185baf6c5..e7a9e7d83 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -10,9 +10,12 @@
   <string name="sync_account_name">contactos linphone</string>
   <!--Common-->
   <string name="username">Nombre de usuario</string>
+  <string name="userid">ID de usuario (opcional)</string>
   <string name="phone_number">Número de teléfono</string>
   <string name="display_name">Nombre a mostrar</string>
   <string name="password">Contraseña</string>
+  <string name="confirm_password">Contraseña de confirmación</string>
+  <string name="domain">Dominio</string>
   <string name="delete">Borrar</string>
   <string name="retry">Reintentar</string>
   <string name="cancel">Cancelar</string>
@@ -36,6 +39,7 @@
   <string name="wizard_failed">Ha ocurrido un error, pruebe más tarde.</string>
   <string name="wizard_username_unavailable">Este nombre de usuario está en uso.</string>
   <string name="first_launch_no_login_password">Por favor, introduzca su usuario y contraseña</string>
+  <string name="use_email_for_validation">Use la dirección de correo electrónico para la validación de la cuenta</string>
   <!--Status-->
   <!--In-app-->
   <!--Dailer-->
@@ -203,4 +207,5 @@
   <string name="content_description_contact_last_name">Apellido</string>
   <string name="content_description_transfer">Transferir</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_title_notification_service">Linphone Service</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8d08b4d9f..6d982194d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -304,4 +304,5 @@
   <string name="content_description_contact_last_name">Sukunimi</string>
   <string name="content_description_transfer">Siirrä</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_title_notification_service">Linphone Palvelin</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fb53093ef..139485461 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -109,8 +109,6 @@
   <string name="use_email_for_validation">Utiliser une adresse mail pour créer un compte</string>
   <string name="login_with_username">Utiliser votre nom d\'utilisateur et votre mot de passe plutôt que votre numéro</string>
   <string name="phone_number_info_title">Comment mon numéro de téléphone sera-t-il utilisé ?</string>
-  <string name="phone_number_info_content">
-Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n</string>
   <string name="phone_number_link_info_content">
 Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n</string>
   <string name="phone_number_link_info_content_already_account">Vous ne pouvez associer votre numéro qu\'à un seul compte Linphone.\n\nSi vous avez déjà associé votre numéro à un autre compte mais préférez utiliser ce compte-ci, suivez la procédure d\'association et votre numéro sera automatiquement transféré à ce compte.</string>
@@ -442,4 +440,5 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="content_description_call_options">Options d\'appel</string>
   <string name="content_description_audio_route">Route audio</string>
   <string name="content_description_exit_conference">Quitter la conférence</string>
+  <string name="content_title_notification_service">Linphone Service</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bd5d0a6d7..05219bf0e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -105,8 +105,6 @@
   <string name="use_email_for_validation">アカウント認証にメールアドレスを使う</string>
   <string name="login_with_username">電話番号の代わりにユーザー名とパスワードを使う</string>
   <string name="phone_number_info_title">私の電話番号は何のために使われますか？</string>
-  <string name="phone_number_info_content">
-\nあなたの電話番号のおかげで、あなたの友人はあなたをより簡単に見つけるでしょう。 \n\nLinphoneを使用しているあなたのアドレス帳にあなたが表示され、あなたの友人はLinphoneでもあなたを呼び出せる事を知ります。\n</string>
   <string name="phone_number_link_info_content">
 \nLinphoneを使用しているあなたのアドレス帳に\nあなたが表示され、あなたの友人は\nLinphoneでもあなたに連絡できることを把握します。</string>
   <string name="phone_number_link_info_content_already_account">アカウントを自分の電話番号にリンクすると、友人があなたをより簡単に見つけることができます。\n\n電話番号は、1つのLinphoneアカウントでのみ使用できます。\n\n既にあなたの番号を他のアカウントにリンクしていたが、\n\nこの番号を使用したい場合は、今すぐリンクする事で番号が自動的にこのアカウントに移動されます。</string>
@@ -429,4 +427,5 @@
   <string name="content_description_call_options">発信オプション</string>
   <string name="content_description_audio_route">オーディオルート</string>
   <string name="content_description_exit_conference">会議を終了する</string>
+  <string name="content_title_notification_service">サービス</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a076c2d2d..2a825c299 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -111,7 +111,6 @@
   <string name="use_email_for_validation">ელფოსტის მისამართის გამოყენება ანგარიშის დასადატურებლად</string>
   <string name="login_with_username">თქვენი მომხმარებლის სახელის და პაროლის გამოყენება თქვენი ტელეფონის ნომრის მაგივრად</string>
   <string name="phone_number_info_title">რისთვის იქნება გამოყენებული ჩემი ტელეფონის ნომერი?</string>
-  <string name="phone_number_info_content">\nთქვენი ტელეფონის ნომრის დახმარებით, თქვენი მეგობრები შეძლებენ გიპოვონ უფრო მარტივად.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n</string>
   <string name="phone_number_link_info_content">\nთქვენი მეგობრები გიპოვიან უფრო მარტივად, თუ მიაბამთ თქვენს ანგარიშს თქვენს ტელფონის ნომერზე.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n</string>
   <string name="phone_number_link_info_content_already_account">თქვენ შეგიძლიათ გამოიყენოთ თქვენი ტელეფონის ნომერი მხოლოდ ერთ Linphone ანგარიშთან.\n\nთუ უკვე მიბმული გაქვთ თქვენი ნომერი სხვა ანგარიშზე, მაგრამ გსურთ ამის გამოყენება, უბრალოდ მიაბით იგი ახლა და თქვენი ნომერი იქნება ავტომატურად გადმოტანილი ამ ანგარიშზე.</string>
   <!--Status-->
@@ -456,5 +455,6 @@
   <string name="content_description_call_options">ზარის პარამეტრები</string>
   <string name="content_description_audio_route">ხმის მარშრუტი</string>
   <string name="content_description_exit_conference">კონფერენციიდან გამოსვლა</string>
+  <string name="content_title_notification_service">Linphone სერვისი</string>
   <string name="content_title_notification">Linphone-ის შეტყობინება</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ffe45a90a..687decc36 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -155,4 +155,5 @@
   <string name="content_description_contact_first_name">Voornaam</string>
   <string name="content_description_contact_last_name">Achternaam</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_title_notification_service">Linphone-dienst</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f9ae013fc..9dcf4f805 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -105,8 +105,6 @@
   <string name="use_email_for_validation">Użyj adresu e-mail do weryfikacji konta</string>
   <string name="login_with_username">Użyj nazwy użytkownika i hasła, zamiast numeru telefonu</string>
   <string name="phone_number_info_title">Jaki będzie używany mój numer telefonu?</string>
-  <string name="phone_number_info_content">
-\nDzięki twojemu numerowi telefonu twoi znajomi będą mogli znaleźć cię łatwiej.\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n</string>
   <string name="phone_number_link_info_content">
 \nTwoi znajomi będą mogli znaleźć cię łatwiej, jeśli połączysz swoje konto do swojego numeru telefonu\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n</string>
   <string name="phone_number_link_info_content_already_account">Można używać tylko swój numer telefonu z jednego konta Linphone.\n\nIf Jeśli masz już połączony swój numer do innego konta, ale wolisz używać tego jednego, wystarczy połączyć go teraz i numer zostanie automatycznie przeniesiony do tego konta.</string>
@@ -424,4 +422,5 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="content_description_call_options">Opcje połączeń</string>
   <string name="content_description_audio_route">Przesyłanie audio</string>
   <string name="content_description_exit_conference">Wyjście konferencji </string>
+  <string name="content_title_notification_service">Linphone Service</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d012d33c2..f0ed01be0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -357,4 +357,5 @@
   <string name="content_description_call_options">Opcões de chamadas</string>
   <string name="content_description_audio_route">Route de áudio</string>
   <string name="content_description_exit_conference">Sair da conferência</string>
+  <string name="content_title_notification_service">Linphone Service</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bdfe085f8..718af1e54 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -111,7 +111,6 @@
   <string name="use_email_for_validation">Использовать адрес электронной почты для проверки учетной записи</string>
   <string name="login_with_username">Вместо номера телефона использовать имя пользователя и пароль</string>
   <string name="phone_number_info_title">Для чего будет использоваться мой номер телефона?</string>
-  <string name="phone_number_info_content">\nБлагодаря номеру телефона вашим друзьям будет проще вас найти.\n\n В вашей адресной книге вы увидите, кто использует Linphone, а ваши друзья смогут узнать, что вы также зарегистрированы в Linphone.\n</string>
   <string name="phone_number_link_info_content">\nВашим друзьям будет проще связаться с вами, если вы свяжете свою учетную запись со своим номером телефона.\n\nВ вашей адресной книге вы увидите, кто использует Linphone, а ваши друзья смогут узнать, что вы также зарегистрированы в Linphone.\n</string>
   <string name="phone_number_link_info_content_already_account">Номер телефона можно использовать только с одной учетной записью Linphone.\n\nЕсли ваш номер уже был связан с другой учетной записью, но вы предпочитаете использовать его, просто свяжите его сейчас, и ваш номер будет автоматически перенесен в эту учетную запись.</string>
   <!--Status-->
@@ -457,5 +456,6 @@
   <string name="content_description_call_options">Параметры вызова</string>
   <string name="content_description_audio_route">Аудио маршрут</string>
   <string name="content_description_exit_conference">Выйти из конференции</string>
+  <string name="content_title_notification_service">Служба Linphone</string>
   <string name="content_title_notification">Уведомление Linphone</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 82144eb6f..eb1cf8454 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -245,4 +245,5 @@
   <string name="content_description_contact_last_name">Презиме</string>
   <string name="content_description_transfer">Пребаци</string>
   <string name="content_description_bluetooth">Блутут</string>
+  <string name="content_title_notification_service">Услуга Линфона</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 31e779931..f0440abc6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -24,7 +24,7 @@
   <string name="domain">Domän</string>
   <string name="remote_provisioning_url">Webbadress</string>
   <string name="email">E-post</string>
-  <string name="delete_text">Är du säker på att du vill radera ta bort val?</string>
+  <string name="delete_text">Är du säker på att du vill ta bort val?</string>
   <string name="delete">Ta bort</string>
   <string name="retry">Försök igen</string>
   <string name="cancel">Avbryt</string>
@@ -111,7 +111,6 @@
   <string name="use_email_for_validation">Använd e-postadress för kontovalidering</string>
   <string name="login_with_username">Använd ditt användarnamn och lösenord istället för ditt telefonnummer</string>
   <string name="phone_number_info_title">Vad ska mitt telefonnummer användas för?</string>
-  <string name="phone_number_info_content">\nTack vare ditt telefonnummer kommer dina vänner att hitta dig lättare.\n\nDu kommer att se i din adressbok vem som använder Linphone och dina vänner kommer att veta att de även kan nå dig på Linphone.\n</string>
   <string name="phone_number_link_info_content">\nDina vänner hittar dig lättare om du kopplar ditt konto till ditt telefonnummer\n\nDu ser i din adressbok vilka som använder Linphone och dina vänner vet att de når dig på Linphone också.\n</string>
   <string name="phone_number_link_info_content_already_account">Du kan bara använda ditt telefonnummer med ett Linphone-konto.\n\nOm du redan har länkat ditt nummer till ett annat konto, men du föredrar att använda det här, kopplar du bara det nu och ditt nummer flyttas automatiskt till det här kontot.</string>
   <!--Status-->
@@ -454,5 +453,6 @@
   <string name="content_description_call_options">Samtalsalternativ</string>
   <string name="content_description_audio_route">Ljudväg</string>
   <string name="content_description_exit_conference">Avsluta konferens</string>
+  <string name="content_title_notification_service">Linphone-tjänst</string>
   <string name="content_title_notification">Linphone-avisering</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2c15e0000..084bc32f4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,6 +16,7 @@
   <string name="sync_account_name">Linphone bağlantıları</string>
   <!--Common-->
   <string name="username">Kullanıcı adı</string>
+  <string name="userid">Kullanıcı kimliği (isteğe bağlı)</string>
   <string name="phone_number">Telefon numarası</string>
   <string name="display_name">Görünen ad</string>
   <string name="password">Parola</string>
@@ -45,6 +46,7 @@
   <string name="maybe_later">Belki daha sonra</string>
   <string name="later">Daha sonra</string>
   <string name="no">Hayır</string>
+  <string name="ok">Tamam</string>
   <string name="yes">Evet</string>
   <string name="link_account">Hesabını bağla</string>
   <!--Launch screen-->
@@ -68,7 +70,7 @@
   <string name="assistant_login_linphone">Linphone hesabı kullan</string>
   <string name="assistant_login_generic">SIP hesabı kullan</string>
   <string name="assistant_remote_provisioning">Uzaktan yapılandırma al</string>
-  <string name="assistant_create_account_part_1">Lütfen ülke kodunuzu onaylayın  ve telefon numaranızı girin</string>
+  <string name="assistant_create_account_part_1">Lütfen ülke kodunuzu doğrulayın  ve telefon numaranızı girin</string>
   <string name="assistant_create_account_part_2">Telefon numaranıza SMS ile bir doğrulama kodu gönderdik:</string>
   <string name="assistant_create_account_part_3">Telefon numarası doğrulamayı tamamlamak için, lütfen 4 haneli kodu aşağı girin:\n</string>
   <string name="assistant_create_account_part_email">Lütfen Linphone hesabınız için bir kullanıcı adı, e-posta ve parola girin</string>
@@ -90,7 +92,7 @@
   <string name="assistant_openh264_restart">OpenH264 çözücüsünü kullanmadan önce %s\'u yeniden başlatmalısınız.</string>
   <string name="assistant_openh264_error">Üzgünüz bir hata oluştu.</string>
   <string name="assistant_codec_downloaded">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indirildi.</string>
-  <string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
+  <string name="wizard_failed">Bir hata oluştu, daha sonra yeniden deneyin.</string>
   <string name="wizard_server_unavailable">Sunucuya ulaşılamıyor,ağ bağlantınızı kontrol edin.</string>
   <string name="wizard_username_unavailable">Bu kullanıcı adı zaten kullanılıyor.</string>
   <string name="assistant_phone_number_unavailable">Bu telefon numarası zaten kullanıldı.\r\nLütfen değişik bir numara girin.\r\nEğer telefon numaranızı yeniden kullanmak istiyorsanız var olan hesabınızı silebilirsiniz.</string>
@@ -109,7 +111,6 @@
   <string name="use_email_for_validation">Hesap doğrulama için e-posta adresi kullan</string>
   <string name="login_with_username">Telefon numaranız yerine kullanıcı adınızı ve parolanızı kullanın</string>
   <string name="phone_number_info_title">Telefon numaram ne için kullanılacak?</string>
-  <string name="phone_number_info_content">\nTelefon numaranız sayesinde arkadaşların seni daha kolay bulacak.\n\n Adres defterinde kimlerin Linphone kullandığını göreceksin ve arkadaşların da sana Linphone üzerinden ulaşabileceklerini bilecek.\n</string>
   <string name="phone_number_link_info_content">\nEğer hesabını telefon numarana bağlarsan arkadaşların seni daha kolay bulacak\n\nAdres listende kimlerin Linphone kullandığını göreceksin ve arkadaşların da sana Linphone üzerinden ulaşabileceğini bilecek.\n</string>
   <string name="phone_number_link_info_content_already_account">Telefon numaranı yalnızca tek Linphone hesabıyla kullanabilirsin.\n\nEğer hesabını zaten başka bir hesaba bağladıysan ama bunu kullanmak istiyorsan, şimdi bağla ve numaran kendiliğinden bu hesaba taşınsın.</string>
   <!--Status-->
@@ -141,7 +142,7 @@
   <!--History-->
   <string name="no_call_history">Çağrı geçmişiniz boş</string>
   <string name="no_missed_call_history">Geçmişinizde yanıtsız çağrı yok</string>
-  <string name="delete_history_log">Seçilmiş çağrı kayıtlarını silmek ister misin?</string>
+  <string name="delete_history_log">Seçilen çağrı kayıtlarını silmek ister misin?</string>
   <string name="today">Bugün</string>
   <string name="yesterday">Dün</string>
   <!--Contacts-->
@@ -174,6 +175,9 @@
   <string name="message_cant_be_decrypted_notif">Bu iletinin şifresini çözemezsiniz.</string>
   <string name="lime_not_verified">ZRTP ile doğrulanmamış bir kişiye LIME kullanarak ileti göndermek istiyorsunuz.\nLütfen bu kişiyi arayın ve iletilerinizi göndermeden önce onun ZRTP anahtarını doğrulayın.</string>
   <string name="processing_image">Görüntü işleniyor, dosyanın boyutuna bağlı olarak bir kaç saniye sürebilir</string>
+  <string name="displayed">Okundu</string>
+  <string name="delivered">Ulaştırıldı</string>
+  <string name="resend">Yeniden gönder</string>
   <!--Status Bar-->
   <string name="status_connected">Kayıtlı</string>
   <string name="status_not_connected">Kayıtsız</string>
@@ -188,9 +192,14 @@
   <!--Call-->
   <string name="incoming_call">Gelen çağrı</string>
   <string name="outgoing_call">Giden çağrı</string>
-  <string name="no_current_call">Etkin arama yok</string>
+  <string name="add_video_dialog">Görüştüğünüz kişi görüntüyü açmak istiyor</string>
+  <string name="no_current_call">Etkin çağrı yok</string>
+  <string name="call_paused_by_remote">Görüştüğünüz kişi çağrıyı duraklattı</string>
   <string name="couldnt_accept_call">Gelen aramanın kabulünde bir hata oluştu</string>
   <string name="zrtp_dialog1">Eş ile aşağıdaki SAS\'ı doğrulayın:\nSöyleyin: %s</string>
+  <string name="zrtp_dialog2">\nGörüştüğünüz kişi şunu söylemeli: %s</string>
+  <string name="zrtp_notification_title">SAS</string>
+  <string name="zrtp_notification_message">Eşiniz ile önceki SAS kodunuzu doğrulayın</string>
   <string name="unknown_incoming_call_name">Bilinmeyen</string>
   <string name="call_stats_audio">Ses</string>
   <string name="call_stats_video">Görüntü</string>
@@ -198,11 +207,15 @@
   <string name="call_stats_ip">IP Ailesi:</string>
   <string name="call_stats_upload">Karşıya yükleme hızı:</string>
   <string name="call_stats_download">İndirme hızı:</string>
+  <string name="call_stats_estimated_download">Tahmini indirme bant genişliği:</string>
   <string name="call_stats_ice">İCE bağlanılabilirliği:</string>
-  <string name="call_stats_video_resolution_sent">Giden video çözünürlüğü:</string>
-  <string name="call_stats_video_resolution_received">Alınan video çözünürlüğü:</string>
+  <string name="call_stats_video_resolution_sent">Giden görüntü çözünürlüğü:</string>
+  <string name="call_stats_video_resolution_received">Alınan görüntü çözünürlüğü:</string>
+  <string name="call_stats_video_fps_sent">Giden görüntü fps\'si:</string>
+  <string name="call_stats_video_fps_received">Alınan görüntü fps\'si:</string>
   <string name="call_stats_sender_loss_rate">Gönderici kayıp oranı:</string>
   <string name="call_stats_receiver_loss_rate">Alıcı kayıp oranı:</string>
+  <string name="call_stats_jitter_buffer">Jitter tamponu:</string>
   <string name="call_stats_encoder_name">Kodlayıcı:</string>
   <string name="call_stats_decoder_name">Çözücü:</string>
   <string name="call">Çağrı</string>
@@ -210,9 +223,9 @@
   <string name="menu_send_log">Günlük gönder</string>
   <string name="menu_reset_log">Günlüğü sıfırla</string>
   <!--Service-->
-  <string name="incall_notif_active">Sesli arama sürüyor</string>
-  <string name="incall_notif_paused">süregiden arama duraklatıldı</string>
-  <string name="incall_notif_video">Görüntülü görüşme sürüyor</string>
+  <string name="incall_notif_active">Sesli çağrı sürüyor</string>
+  <string name="incall_notif_paused">Duraklayan çağrı sürüyor</string>
+  <string name="incall_notif_video">Görüntülü çağrı sürüyor</string>
   <string name="notification_started">Başladı</string>
   <string name="unread_messages">%i okunmamış iletiler</string>
   <string name="missed_calls_notif_title">Yanıtsız çağrı</string>
@@ -226,11 +239,12 @@
   <string name="error_user_busy">Kullanıcı meşgul</string>
   <string name="error_user_not_found">Kullanıcı bulunamadı</string>
   <string name="error_incompatible_media">Uyumsuz ortam değişkenleri</string>
+  <string name="error_low_bandwidth">Görüştüğünüz kişinin bant genişliği düşük, görüntü başlatılamaz</string>
   <string name="error_network_unreachable">Ağa erişim yok</string>
   <string name="error_bad_credentials">Referansı kötü</string>
   <string name="error_unauthorized">Kimlik doğrulanmadı</string>
   <string name="error_io_error">Ağ hatası</string>
-  <string name="download_image_failed">İndirme başarısız. Lütfen ağ bağlantınızı gözden geçirin ya da daha sonra tekrar deneyin.</string>
+  <string name="download_image_failed">İndirme başarısız. Lütfen ağ bağlantınızı gözden geçirin ya da daha sonra yeniden deneyin.</string>
   <string name="remote_provisioning_failure">Uzaktan yetkilendirme profili indirilirmesi ya da uygulanması başarısız...</string>
   <string name="remote_provisioning_again_title">Uzaktan yetkilendirme</string>
   <string name="remote_provisioning_again_message">Uzaktan yetkilendirme adresinizi değiştirmek istiyor musunuz?</string>
@@ -284,7 +298,7 @@
   </string-array>
   <string name="pref_none">Hiçbiri</string>
   <string name="pref_preferences_title">Yeğlenenler</string>
-  <string name="pref_video_enable_title">Görüntü etkin</string>
+  <string name="pref_video_enable_title">Görüntüyü Etkinleştir</string>
   <!--Audio settings-->
   <string name="pref_audio_title">Ses</string>
   <string name="pref_echo_cancellation">Yankı giderme</string>
@@ -300,10 +314,10 @@
   <string name="pref_codecs">Çözücüler</string>
   <!--Video settings-->
   <string name="pref_video_title">Görüntü</string>
-  <string name="pref_overlay">Video örten katmanı</string>
-  <string name="pref_overlay_summary">Uygulamanın dışındayken çağrı videosunu örten tabakada göster</string>
+  <string name="pref_overlay">Görüntü örten katmanı</string>
+  <string name="pref_overlay_summary">Uygulamanın dışındayken çağrı görüntüsünü örten tabakada göster</string>
   <string name="pref_video_use_front_camera_title">Ön kamerayı kullan</string>
-  <string name="pref_video_initiate_call_with_video_title">Görüntülü arama başlat</string>
+  <string name="pref_video_initiate_call_with_video_title">Görüntülü çağrı başlat</string>
   <string name="pref_video_initiate_call_with_video">Görüntü isteğini her zaman gönder</string>
   <string name="pref_video_automatically_accept_video_title">Gelen görüntü isteklerini kabul et</string>
   <string name="pref_video_automatically_accept_video">Görüntü isteklerini her zaman kabul et</string>
@@ -316,8 +330,10 @@
   <string name="pref_call_title">Çağrı</string>
   <string name="pref_device_ringtone">Aygıt zil sesini kullan</string>
   <string name="pref_auto_answer">Gelen çağrıları kendiliğinden yanıtla</string>
+  <string name="pref_auto_answer_time">Kendiliğinden yanıtlama zamanı (milisaniye türünde)</string>
   <string name="pref_rfc2833_dtmf">Bant içi DTMF(RFC2833) gönder</string>
   <string name="pref_sipinfo_dtmf">Bant dışı DTMF(SIP INFO) gönder</string>
+  <string name="pref_call_timeout_title">Çağrı zaman aşımı (saniye türünde)</string>
   <string name="pref_voice_mail">Sesli posta adresi</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Konuşma</string>
@@ -331,6 +347,7 @@
   <!--Network settings-->
   <string name="pref_network_title">Ağ</string>
   <string name="pref_wifi_only">Yalnızca WiFi kullan</string>
+  <string name="pref_doze_mode">Hafif uyku kipi</string>
   <string name="pref_stun_server">STUN / TURN sunucusu</string>
   <string name="pref_ice_enable">ICE etkin</string>
   <string name="pref_turn_enable">TURN etkin</string>
@@ -350,6 +367,7 @@
   <string name="pref_advanced_title">Gelişmiş</string>
   <string name="pref_debug_title">Hata ayıklama</string>
   <string name="pref_debug">Hata ayıklama</string>
+  <string name="pref_friendlist_subscribe">Arkadaş listesi aboneliği</string>
   <string name="pref_background_mode">Artalan kipi</string>
   <string name="pref_animation_enable_title">Animasyonlar etkin</string>
   <string name="pref_service_notification">Hizmet bildirimi etkin</string>
@@ -389,7 +407,7 @@
   <string name="content_description_send_message">İleti gönder</string>
   <string name="content_description_detail">Ayrıntılar</string>
   <string name="content_description_delete">Sil</string>
-  <string name="content_description_add">Arama ekle</string>
+  <string name="content_description_add">Çağrı ekle</string>
   <string name="content_description_new_discussion">Yeni tartışma</string>
   <string name="content_description_search">Arama</string>
   <string name="content_description_search_contact">Bağlantı ara</string>
@@ -400,13 +418,13 @@
   <string name="content_description_all_calls">Tüm çağrılar</string>
   <string name="content_description_missed_calls">Yanıtsız çağrılar</string>
   <string name="content_description_switch_video">Görüntü düğmesi</string>
-  <string name="content_description_add_call">Arama ekle</string>
+  <string name="content_description_add_call">Çağrı ekle</string>
   <string name="content_description_pause">Duraklat</string>
   <string name="content_description_numpad">Sayısal tuş takımı</string>
   <string name="content_description_history">Geçmiş düğmesi</string>
   <string name="content_description_chat_button">Konuşma düğmesi</string>
   <string name="content_description_contacts">Bağlantılar düğmesi</string>
-  <string name="content_description_call_quality">Çağrı kalitesi</string>
+  <string name="content_description_call_quality">Çağrı niteliği</string>
   <string name="content_description_encryption">Şifreleme</string>
   <string name="content_description_switch_camera">Kamera düğmesi</string>
   <string name="content_description_cancel_button">İptal düğmesi</string>
@@ -418,7 +436,7 @@
   <string name="content_description_display_field">Görünen ad alanı</string>
   <string name="content_description_domain_field">Alan adı alanı</string>
   <string name="content_description_url_field">Uzaktan yetkilendirme alanı</string>
-  <string name="content_description_confirm_password_field">Parola onaylama alanı</string>
+  <string name="content_description_confirm_password_field">Parola doğrulama alanı</string>
   <string name="content_description_email_field">Eposta alanı</string>
   <string name="content_description_default_account">Öntanımlı hesap</string>
   <string name="content_description_deselect_all">Tüm seçilenleri iptal et</string>
@@ -427,7 +445,7 @@
   <string name="content_description_contact_first_name">Ad</string>
   <string name="content_description_contact_last_name">Soyadı</string>
   <string name="content_description_contact_organization">Kuruluş</string>
-  <string name="content_description_back_call">Aramaya dön</string>
+  <string name="content_description_back_call">Çağrıya dön</string>
   <string name="content_description_send_file">Bir dosya gönder</string>
   <string name="content_description_incoming_file">Gelen dosya</string>
   <string name="content_description_message">İleti</string>
@@ -438,4 +456,6 @@
   <string name="content_description_call_options">Çağrı seçenekleri</string>
   <string name="content_description_audio_route">Ses yolu</string>
   <string name="content_description_exit_conference">Görüşmeden çık</string>
+  <string name="content_title_notification_service">Linphone Hizmeti</string>
+  <string name="content_title_notification">Linphone Bildirimi</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c6470e632..3e61efc1a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -108,7 +108,6 @@
   <string name="use_email_for_validation">使用邮箱地址来激活帐户</string>
   <string name="login_with_username">用您的用户名和密码来代替电话号码</string>
   <string name="phone_number_info_title">我的电话号码将用于？</string>
-  <string name="phone_number_info_content">如果将您的帐户关联您的电话号码，您的朋友们可以更容易的找到你。您在通讯录里可以查看谁在使用Linphone，他们也同样可以通过Linphone联系您。</string>
   <string name="phone_number_link_info_content">如果将您的帐户关联您的电话号码，您的朋友们可以更容易的找到你。您在通讯录里可以查看谁在使用Linphone，他们也同样可以通过Linphone联系您。</string>
   <string name="phone_number_link_info_content_already_account">您的电话号码只能关联一个Linphone帐户。如果您已经把您的号码关联了其他账户，但是你更想使用这个。只需关联您现在的帐户，你的号码就会自动转移到这个账户。</string>
   <!--Status-->
@@ -435,4 +434,5 @@
   <string name="content_description_call_options">通话选项</string>
   <string name="content_description_audio_route">音频路由</string>
   <string name="content_description_exit_conference">退出会话</string>
+  <string name="content_title_notification_service">Linphone服务</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9f6ec6ce1..af71ea2be 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -309,4 +309,5 @@
   <string name="content_description_transfer">轉接</string>
   <string name="content_description_bluetooth">藍牙</string>
   <string name="content_description_call_options">通話選項</string>
+  <string name="content_title_notification_service">Linphone 服務</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a9dd5d5a..5e867a6dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -116,7 +116,7 @@
     <string name="use_email_for_validation">Use email address for account validation</string>
     <string name="login_with_username">Use your username and password instead of your phone number</string>
     <string name="phone_number_info_title">What will my phone number be used for?</string>
-    <string name="phone_number_info_content">\nThanks to your phone number, your friends will find you more easily.\n\n You will see in your address book who is using Linphone and your friends will know that they can rach you on Linphone as well.\n</string>
+    <string name="phone_number_info_content">\nThanks to your phone number, your friends will find you more easily.\n\n You will see in your address book who is using Linphone and your friends will know that they can reach you on Linphone as well.\n</string>
     <string name="phone_number_link_info_content">\nYour friends will find you more easily if you link your account to your phone number\n\nYou will see in your address book who is using Linphone and your friends will know that they can reach you on Linphone as well.\n</string>
     <string name="phone_number_link_info_content_already_account">You can only use your phone number with one Linphone account.\n\nIf you had already linked your number to an other account but you prefer to use this one, simply link it now and your number will automatically be moved to this account.</string>
 
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index eb2dcce44..5ed76d964 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1360,8 +1360,11 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso
 					if (mLc != null) {
 						if (mLc.getCallsNb() > 0) {
 							mLc.acceptCall(call);
-							LinphoneManager.getInstance().routeAudioToReceiver();
-							LinphoneActivity.instance().startIncallActivity(call);
+							if (LinphoneManager.getInstance() != null) {
+								LinphoneManager.getInstance().routeAudioToReceiver();
+								if (LinphoneActivity.instance() != null)
+									LinphoneActivity.instance().startIncallActivity(call);
+							}
 						}
 					}
 				}
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 81f77b2c7..e1574c486 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -738,7 +738,7 @@ public final class LinphoneUtils {
 	}
 
 	public static void displayErrorAlert(String msg, Context ctxt) {
-		if (ctxt != null) {
+		if (ctxt != null && msg != null) {
 			AlertDialog.Builder builder = new AlertDialog.Builder(ctxt);
 			builder.setMessage(msg)
 					.setCancelable(false)
@@ -797,9 +797,7 @@ public final class LinphoneUtils {
 
 				return getDataColumn(context, contentUri, selection, selectionArgs);
 			}
-		} else if ("content".equalsIgnoreCase(uri.getScheme())) { // Content
-			// Google photo uri example
-			// content://com.google.android.apps.photos.contentprovider/0/1/mediakey%3A%2FAF1QipMObgoK_wDY66gu0QkMAi/ORIGINAL/NONE/114919
+		} else if ("content".equalsIgnoreCase(uri.getScheme())) {
 			String type = getTypeFromUri(uri, context);
 			String result = getDataColumn(context, uri, null, null); //
 			if (TextUtils.isEmpty(result))
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index 238ac7bdc..131d6675e 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -139,8 +139,10 @@ private static AssistantActivity instance;
         mPrefs = LinphonePreferences.instance();
 		status.enableSideMenu(false);
 
-		accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
-		accountCreator.setListener(this);
+		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
+			accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
+			accountCreator.setListener(this);
+		}
 
 		countryListAdapter = new CountryListAdapter(getApplicationContext());
         mListener = new CoreListenerStub() {
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 6b92fa16d..da55a2033 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -896,7 +896,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 	protected void toggleSpeaker() {
 		isSpeakerEnabled = !isSpeakerEnabled;
 		if (LinphoneManager.getLc().getCurrentCall() != null) {
-			LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled);
+			if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall()))
+				LinphoneManager.getInstance().enableProximitySensing(false);
+			else
+				LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled);
 		}
 		if (isSpeakerEnabled) {
 			LinphoneManager.getInstance().routeAudioToSpeaker();
diff --git a/src/android/org/linphone/fragments/HistoryListFragment.java b/src/android/org/linphone/fragments/HistoryListFragment.java
index 27e7f3f10..a8e3374d7 100644
--- a/src/android/org/linphone/fragments/HistoryListFragment.java
+++ b/src/android/org/linphone/fragments/HistoryListFragment.java
@@ -473,6 +473,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 			}
 
 			LinphoneContact c = ContactsManager.getInstance().findContactFromAddress(address);
+			if (c == null) c = ContactsManager.getInstance().findContactFromPhoneNumber(address.getUsername());
 			String displayName = null;
 			final String sipUri = address.asString();
 			if (c != null) {
diff --git a/src/android/org/linphone/receivers/BluetoothManager.java b/src/android/org/linphone/receivers/BluetoothManager.java
index 6aa4d2fad..c2fb816b6 100644
--- a/src/android/org/linphone/receivers/BluetoothManager.java
+++ b/src/android/org/linphone/receivers/BluetoothManager.java
@@ -20,12 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import java.util.List;
 
-import org.linphone.LinphoneManager;
-import org.linphone.LinphoneService;
-import org.linphone.call.CallActivity;
-import org.linphone.mediastream.Log;
-
-import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothAssignedNumbers;
 import android.bluetooth.BluetoothDevice;
@@ -36,17 +30,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+import org.linphone.LinphoneManager;
+import org.linphone.LinphoneService;
+import org.linphone.call.CallActivity;
+
 public class BluetoothManager extends BroadcastReceiver {
-	public int PLANTRONICS_BUTTON_PRESS = 1;
-	public int PLANTRONICS_BUTTON_LONG_PRESS = 2;
-	public int PLANTRONICS_BUTTON_DOUBLE_PRESS = 5;
-
-	public int PLANTRONICS_BUTTON_CALL = 2;
-	public int PLANTRONICS_BUTTON_MUTE = 3;
-
 	private static BluetoothManager instance;
 
 	private Context mContext;
@@ -68,14 +57,14 @@ public class BluetoothManager extends BroadcastReceiver {
 	public BluetoothManager() {
 		isBluetoothConnected = false;
 		if (!ensureInit()) {
-			Log.w("[Bluetooth] Manager tried to init but LinphoneService not ready yet...");
+			android.util.Log.w("BluetoothManager", "[Bluetooth] Manager tried to init but LinphoneService not ready yet...");
 		}
 		instance = this;
 	}
 
 	public void initBluetooth() {
 		if (!ensureInit()) {
-			Log.w("[Bluetooth] Manager tried to init bluetooth but LinphoneService not ready yet...");
+			android.util.Log.w("BluetoothManager", "[Bluetooth] Manager tried to init bluetooth but LinphoneService not ready yet...");
 			return;
 		}
 
@@ -85,14 +74,14 @@ public class BluetoothManager extends BroadcastReceiver {
 		filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
 		filter.addAction(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT);
 		mContext.registerReceiver(this,  filter);
-		Log.d("[Bluetooth] Receiver started");
+		android.util.Log.d("BluetoothManager", "[Bluetooth] Receiver started");
 
 		startBluetooth();
 	}
 
 	private void startBluetooth() {
 		if (isBluetoothConnected) {
-			Log.e("[Bluetooth] Already started, skipping...");
+			android.util.Log.e("BluetoothManager", "[Bluetooth] Already started, skipping...");
 			return;
 		}
 
@@ -100,14 +89,14 @@ public class BluetoothManager extends BroadcastReceiver {
 
 		if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
 			if (mProfileListener != null) {
-				Log.w("[Bluetooth] Headset profile was already opened, let's close it");
+				android.util.Log.w("BluetoothManager", "[Bluetooth] Headset profile was already opened, let's close it");
 				mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset);
 			}
 
 			mProfileListener = new BluetoothProfile.ServiceListener() {
 				public void onServiceConnected(int profile, BluetoothProfile proxy) {
 				    if (profile == BluetoothProfile.HEADSET) {
-				        Log.d("[Bluetooth] Headset connected");
+					    android.util.Log.d("BluetoothManager", "[Bluetooth] Headset connected");
 				        mBluetoothHeadset = (BluetoothHeadset) proxy;
 				        isBluetoothConnected = true;
 				    }
@@ -116,17 +105,17 @@ public class BluetoothManager extends BroadcastReceiver {
 				    if (profile == BluetoothProfile.HEADSET) {
 				        mBluetoothHeadset = null;
 				        isBluetoothConnected = false;
-				        Log.d("[Bluetooth] Headset disconnected");
+					    android.util.Log.d("BluetoothManager", "[Bluetooth] Headset disconnected");
 				        LinphoneManager.getInstance().routeAudioToReceiver();
 				    }
 				}
 			};
 			boolean success = mBluetoothAdapter.getProfileProxy(mContext, mProfileListener, BluetoothProfile.HEADSET);
 			if (!success) {
-				Log.e("[Bluetooth] getProfileProxy failed !");
+				android.util.Log.e("BluetoothManager", "[Bluetooth] getProfileProxy failed !");
 			}
 		} else {
-			Log.w("[Bluetooth] Interface disabled on device");
+			android.util.Log.w("BluetoothManager", "[Bluetooth] Interface disabled on device");
 		}
 	}
 
@@ -159,7 +148,7 @@ public class BluetoothManager extends BroadcastReceiver {
 		if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled() && mAudioManager != null && mAudioManager.isBluetoothScoAvailableOffCall()) {
 			if (isBluetoothHeadsetAvailable()) {
 				if (mAudioManager != null && !mAudioManager.isBluetoothScoOn()) {
-					Log.d("[Bluetooth] SCO off, let's start it");
+					android.util.Log.d("BluetoothManager", "[Bluetooth] SCO off, let's start it");
 					mAudioManager.setBluetoothScoOn(true);
 					mAudioManager.startBluetoothSco();
 				}
@@ -186,12 +175,12 @@ public class BluetoothManager extends BroadcastReceiver {
 			}
 			if (ok) {
 				if (retries > 0) {
-					Log.d("[Bluetooth] Audio route ok after " + retries + " retries");
+					android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route ok after " + retries + " retries");
 				} else {
-					Log.d("[Bluetooth] Audio route ok");
+					android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route ok");
 				}
 			} else {
-				Log.d("[Bluetooth] Audio route still not ok...");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route still not ok...");
 			}
 
 			return ok;
@@ -218,7 +207,7 @@ public class BluetoothManager extends BroadcastReceiver {
 						break;
 					}
 				}
-				Log.d(isHeadsetConnected ? "[Bluetooth] Headset found, bluetooth audio route available" : "[Bluetooth] No headset found, bluetooth audio route unavailable");
+				android.util.Log.d("BluetoothManager", isHeadsetConnected ? "[Bluetooth] Headset found, bluetooth audio route available" : "[Bluetooth] No headset found, bluetooth audio route unavailable");
 			}
 			return isHeadsetConnected;
 		}
@@ -243,12 +232,12 @@ public class BluetoothManager extends BroadcastReceiver {
 				mAudioManager.stopBluetoothSco();
 				mAudioManager.setBluetoothScoOn(false);
 			}
-			Log.w("[Bluetooth] SCO disconnected!");
+			android.util.Log.w("BluetoothManager", "[Bluetooth] SCO disconnected!");
 		}
 	}
 
 	public void stopBluetooth() {
-		Log.w("[Bluetooth] Stopping...");
+		android.util.Log.w("BluetoothManager", "[Bluetooth] Stopping...");
 		isBluetoothConnected = false;
 
 		disableBluetoothSCO();
@@ -259,7 +248,7 @@ public class BluetoothManager extends BroadcastReceiver {
 		}
 		mBluetoothDevice = null;
 
-		Log.w("[Bluetooth] Stopped!");
+		android.util.Log.w("BluetoothManager", "[Bluetooth] Stopped!");
 
 		if (LinphoneManager.isInstanciated()) {
 			LinphoneManager.getInstance().routeAudioToReceiver();
@@ -274,10 +263,10 @@ public class BluetoothManager extends BroadcastReceiver {
 
 			try {
 				mContext.unregisterReceiver(this);
-				Log.d("[Bluetooth] Receiver stopped");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] Receiver stopped");
 			} catch (Exception e) {}
 		} catch (Exception e) {
-			Log.e(e);
+			android.util.Log.e("BluetoothManager", e.getMessage());
 		}
 	}
 
@@ -289,32 +278,32 @@ public class BluetoothManager extends BroadcastReceiver {
         if (AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED.equals(action)) {
         	int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0);
 			if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
-				Log.d("[Bluetooth] SCO state: connected");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: connected");
 //				LinphoneManager.getInstance().audioStateChanged(AudioState.BLUETOOTH);
     			isScoConnected = true;
 			} else if (state == AudioManager.SCO_AUDIO_STATE_DISCONNECTED) {
-				Log.d("[Bluetooth] SCO state: disconnected");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: disconnected");
 //				LinphoneManager.getInstance().audioStateChanged(AudioState.SPEAKER);
         		isScoConnected = false;
 			} else if (state == AudioManager.SCO_AUDIO_STATE_CONNECTING) {
-				Log.d("[Bluetooth] SCO state: connecting");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: connecting");
 //				LinphoneManager.getInstance().audioStateChanged(AudioState.BLUETOOTH);
 				isScoConnected = true;
 			} else {
-        		Log.d("[Bluetooth] SCO state: " + state);
+				android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: " + state);
         	}
 	        refreshCallView();
         }
         else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) {
         	int state = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, BluetoothAdapter.STATE_DISCONNECTED);
         	if (state == 0) {
-        		Log.d("[Bluetooth] State: disconnected");
+		        android.util.Log.d("BluetoothManager", "[Bluetooth] State: disconnected");
         		stopBluetooth();
         	} else if (state == 2) {
-        		Log.d("[Bluetooth] State: connected");
+		        android.util.Log.d("BluetoothManager", "[Bluetooth] State: connected");
         		startBluetooth();
         	} else {
-        		Log.d("[Bluetooth] State: " + state);
+		        android.util.Log.d("BluetoothManager", "[Bluetooth] State: " + state);
         	}
         }
         else if (intent.getAction().equals(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT)) {
@@ -323,16 +312,16 @@ public class BluetoothManager extends BroadcastReceiver {
 
 			Object[] args = (Object[]) intent.getExtras().get(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS);
 			if (args.length <= 0) {
-				Log.d("[Bluetooth] Event: " + command + ", no args");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + ", no args");
 				return;
 			}
 			String eventName = (args[0]).toString();
 			if (eventName.equals("BUTTON") && args.length >= 3) {
 				String buttonID = args[1].toString();
 				String mode = args[2].toString();
-				Log.d("[Bluetooth] Event: " + command + " : " + eventName + ", id = " + buttonID + " (" + mode + ")");
+				android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + " : " + eventName + ", id = " + buttonID + " (" + mode + ")");
 			} else {
-				Log.d("[Bluetooth] Event: " + command + " : " + eventName);
+				android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + " : " + eventName);
 			}
     	}
     }
diff --git a/src/android/org/linphone/receivers/BootReceiver.java b/src/android/org/linphone/receivers/BootReceiver.java
index de3808f49..360382a8d 100644
--- a/src/android/org/linphone/receivers/BootReceiver.java
+++ b/src/android/org/linphone/receivers/BootReceiver.java
@@ -19,17 +19,14 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
 import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
 import org.linphone.LinphoneService;
 import org.linphone.compatibility.Compatibility;
-import org.linphone.core.Factory;
-import org.linphone.core.Config;
-import org.linphone.mediastream.Log;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
 
 public class BootReceiver extends BroadcastReceiver {
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 4fa147c83..cb61c78c9 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 4fa147c835e3b2b374a15e6257942da4aec3a263
+Subproject commit cb61c78c98c7231ad230633e92c3bb98b5a5991d