Hotfix/4.0.1

Merged jehan requested to merge hotfix/4.0.1 into master

I'll carefully choose right version of ms2/belle-sip during merge

Merge request reports