Merge pull request #6370 from Leo-PL/proto-mbim