Remedial Work | SD CCS

LICENSE: #1047699