(cherry picked from commit 18bb2b10)See !3335 (merged)
Linked bctoolbox!214 (merged) liblinphone!2366 (merged)