(cherry picked from commit 4350e919)
See flexisip!1060 (merged)
Linked : belle-sip!336 (merged) ; !3935 (merged) ; flexisip!1061 (merged)