(cherry picked from commit 0be455dd)
From !841 (merged) with conflicts.
https://mantis.linphone.org/view.php?id=11331 (fixed)
https://bugs.linphone.org/view.php?id=11474 (TODO before merge)
(cherry picked from commit 0be455dd)
From !841 (merged) with conflicts.
https://mantis.linphone.org/view.php?id=11331 (fixed)
https://bugs.linphone.org/view.php?id=11474 (TODO before merge)