Merge pull request #7738 from TDT-AG/pr/20181220-mwan3