DEV-STOP-FIX-4794