(cherry picked from commit 2484cfb1) (cherry picked from commit 591b0c7b)
From !1224 (merged) and !1234 (merged)
FLEXISIP-237