Merge "Removed exposed debug port 7001 in SDC"