Merge pull request #1587 from TDT-AG/pr/20180123-mwan3-fixes