Merge branch 'wwan-improvements'