Merge "CDS-SDC Listener application"