CX-016641: Workplace Safety Improvements