DEV-STOP-FIX-5987