Merge "SDC Listner Docker touchup"