DEV-STOP-FIX-7953