Merge pull request #10538 from TDT-AG/pr/20191113-mwan3