Merge "Removed exposed debug port 4001 in SDC" into staging