feature-ddc-SAFETY-FIRST