Merge branch 'mptcp-miscellaneous-refactoring-and-small-fixes'