Merge pull request #4235 from TDT-GmbH/mwan3track-refactoring