Merge "Refactored SOTN and SDWAN DG"