Merge pull request #4688 from TDT-GmbH/mwan3-features