DEV-STOP-FIX-0845